Update grammar

diff --git a/grammar/export_grammar.py b/grammar/export_grammar.py
index 9861b143ac143deff665ca08383541af10a4429f..7bdf010bd79919436b5cedb11f2008d3f0cfd7e1 100755 (executable)
--- a/grammar/export_grammar.py
+++ b/grammar/export_grammar.py
@@ -5,9 +5,10 @@ Author: Jeroen van der Heijden (Transceptor Technology)
 Date: 2016-10-10
 '''
 import os
-import sys
-sys.path.insert(0, '../../pyleri/')
+# import sys
+# sys.path.insert(0, '../../pyleri/')
 from grammar import siri_grammar
+from pyleri import Grammar
 
 
 if __name__ == '__main__':
@@ -31,8 +32,6 @@ if __name__ == '__main__':
 
     print('\nFinished creating new c-grammar files...\n')
 
-    js_file = siri_grammar.export_js()
-
     EXPORT_PATH = 'jsgrammar'
 
     try:
@@ -40,12 +39,21 @@ if __name__ == '__main__':
     except FileExistsError:
         pass
 
+    js_file = siri_grammar.export_js(js_template=Grammar.JS_WINDOW_TEMPLATE)
+
     with open(os.path.join(EXPORT_PATH, 'grammar.js'),
               'w',
               encoding='utf-8') as f:
         f.write(js_file)
 
-    print('\nFinished creating new js-grammar file...\n')
+    js_es6_file = siri_grammar.export_js()
+
+    with open(os.path.join(EXPORT_PATH, 'SiriGrammar.js'),
+              'w',
+              encoding='utf-8') as f:
+        f.write(js_es6_file)
+
+    print('\nFinished creating new js-grammar files...\n')
 
     py_file = siri_grammar.export_py()
 

diff --git a/include/siri/grammar/grammar.h b/include/siri/grammar/grammar.h
index 1e51a7c6320d8ead170ce4331809e42c0b8eec2e..b8feaa168fcd5d029f6ef6577525b5e3abd85292 100644 (file)
--- a/include/siri/grammar/grammar.h
+++ b/include/siri/grammar/grammar.h
@@ -5,7 +5,7 @@
  * should be used with the libcleri module.
  *
  * Source class: SiriGrammar
- * Created at: 2018-06-29 22:48:05
+ * Created at: 2018-07-05 16:20:26
  */
 #ifndef CLERI_EXPORT_SIRI_GRAMMAR_GRAMMAR_H_
 #define CLERI_EXPORT_SIRI_GRAMMAR_GRAMMAR_H_

diff --git a/src/siri/grammar/grammar.c b/src/siri/grammar/grammar.c
index 467913e087c1dc3e9c6d67415c061f6be926cf70..cdc883eb52fed8db0b435c997a8429eb658892a2 100644 (file)
--- a/src/siri/grammar/grammar.c
+++ b/src/siri/grammar/grammar.c
@@ -5,7 +5,7 @@
  * should be used with the libcleri module.
  *
  * Source class: SiriGrammar
- * Created at: 2018-06-29 22:48:05
+ * Created at: 2018-07-05 16:20:26
  */
 
 #include "siri/grammar/grammar.h"